Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds fluff calendars #7047

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Adds fluff calendars #7047

wants to merge 3 commits into from

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Aug 27, 2024

About the pull request

Adds factions specific calendars that show current date, ingame year and name as well as description of a current holiday if there is any.

Calendars exist in: UA, UPP, WY, TWE variants repsectively, as well as colony calendar without faction.

Calendars are faction locked and they have unique lists of holidays that'd only show for a specific calendar, you wouldn't see Empress Birthday on the UPP or UA calendar for example.

chrome_fjmy3TstGP

The holiday code itself is extremely simplified code of TG holidays system.

Sprites by me.

Explain why it's good for the game

More fluff and lore bits - good.

Changelog

🆑
add: added calendars and holidays lists related to them
/:cl:

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 27, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels Aug 27, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 27, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@deathrobotpunch
Copy link
Contributor

I LOVE LORE FLUFF!!!


/obj/structure/sign/calendar/upp
icon_state = "calendar_upp"
desc = "Classic office decoration and a place to stare at maniacally, has a UPP logo on it, also all text is in Russian."
Copy link
Contributor

@efzapa efzapa Aug 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Classic office decoration with a spot to stare at maniacally. Features a UPP logo, with all text in Russian.

grammar should be fixed here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Sep 1, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@IroquoisLou
Copy link

Spess holiday mentions the first cosmonaut being over 600 years ago but in reality it would only be over 200

@cmss13-ci
Copy link
Contributor

cmss13-ci bot commented Oct 27, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@cmss13-ci cmss13-ci bot added the Stale beg a maintainer to review your PR label Oct 27, 2024
@Blundir Blundir removed the Stale beg a maintainer to review your PR label Oct 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants